Merge from origin/emacs-27

fbf1cb2bf2 (origin/emacs-27) Fix overfull hbox in Emacs manual
fda60094a2 Minor copyedits of Emacs manual

# Conflicts:
#	doc/emacs/display.texi

diff --cc doc/emacs/display.texi
index f6c422aa90664de9acb6a291ba880cd089a435fc,dfd3a5a43d44c0ad5b7e8db5218f4f7e7a9683fd..ae345c11df5fc5c299794a122dd1bbf98a499ab8
--- 1/doc/emacs/display.texi
--- 2/doc/emacs/display.texi
+++ b/doc/emacs/display.texi
@@@ -1189,8 -1181,8 +1189,8 @@@ that has some special meaning for forma
  program.
  
    To activate the fill-column indication display, use the minor modes
- @kbd{M-x display-fill-@-column-indicator-mode} and
- @kbd{M-x global-display-fill-column-indicator-mode}, which enable
 -@code{display-fill-column-indicator-mode} and
++@code{display-fill-@-column-indicator-mode} and
+ @code{global-display-fill-column-indicator-mode}, which enable
  the indicator locally or globally, respectively.
  
  Alternatively, you can set the two buffer-local variables